From b6c04726c6c731859c28312ee9ef629cb3f825b9 Mon Sep 17 00:00:00 2001 From: Alexandre Emsenhuber Date: Sat, 26 May 2012 18:31:32 +0200 Subject: [PATCH] Removed function_exists() check for header_remove() since it's now always available. header_remove() was added in PHP 5.3.0 which is below that our minimum requirement; also fixed a comment for the minimum required PHP version. Change-Id: Ib6992ed772f1a707f96020fdfe6eb6152102402a --- includes/GlobalFunctions.php | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php index 7aec2e21c2..cc93aa45f7 100644 --- a/includes/GlobalFunctions.php +++ b/includes/GlobalFunctions.php @@ -30,7 +30,7 @@ if ( !defined( 'MEDIAWIKI' ) ) { /** * Compatibility functions * - * We support PHP 5.2.3 and up. + * We support PHP 5.3.2 and up. * Re-implementations of newer functions or functions in non-standard * PHP extensions may be included here. */ @@ -2198,13 +2198,7 @@ function wfResetOutputBuffers( $resetGzipEncoding = true ) { if( $status['name'] == 'ob_gzhandler' ) { // Reset the 'Content-Encoding' field set by this handler // so we can start fresh. - if ( function_exists( 'header_remove' ) ) { - // Available since PHP 5.3.0 - header_remove( 'Content-Encoding' ); - } else { - // We need to provide a valid content-coding. See bug 28069 - header( 'Content-Encoding: identity' ); - } + header_remove( 'Content-Encoding' ); break; } } -- 2.20.1